Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 28 Oct 2011 21:29:56 +0000 (14:29 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 28 Oct 2011 21:29:56 +0000 (14:29 -0700)

Trivial merge